From 041818c2238cffbd2af23681297564f982bf45f7 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Fri, 26 Apr 2024 08:40:55 +0200 Subject: [PATCH] build reproducibly without rpath and set LD_LIBRARY_PATH for running tests --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 3a36083b..faa9bd81 100755 --- a/debian/rules +++ b/debian/rules @@ -34,15 +34,13 @@ export DEB_CXXFLAGS_MAINT_APPEND %: dh $@ --buildsystem=cmake -# SKIP_RPATH=OFF to run test suite: -# see #701231 CMAKE_EXTRA_FLAGS += \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_BUILD_TYPE:STRING=None \ -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \ -DCMAKE_CXX_STANDARD:STRING=17 \ -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk18 \ - -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DDCMTK_ENABLE_PRIVATE_TAGS:BOOL=ON \ -DDCMTK_ENABLE_STL:BOOL=ON \ @@ -73,10 +71,12 @@ override_dh_auto_build-arch: override_dh_auto_build-indep: $(MAKE) -C obj-* DOXYGEN +override_dh_auto_test-arch: + LD_LIBRARY_PATH=$(wildcard $(CURDIR)/obj-*/lib):$(LD_LIBRARY_PATH) dh_auto_test + # No tests needed for docs override_dh_auto_test-indep: - override_dh_auto_install-arch: dh_auto_install -- 2.30.2